Stichworte: Improve functional structure